Merge branch 'master' of bitbucket.org:demolium/shop_abloc

# Conflicts:
#	.idea/php.xml
#	composer.lock
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	deleted:    .idea/.gitignore
#	deleted:    .idea/inspectionProfiles/Project_Default.xml
#	deleted:    .idea/misc.xml
#	deleted:    .idea/modules.xml
#	deleted:    .idea/php.xml
#	deleted:    .idea/shop_abloc.iml
#	deleted:    .idea/vcs.xml
#