Merge branch 'master' of https://github.com/microhackaton/facebook-collector

Conflicts:
	src/main/resources/application.properties
Merge branch 'master' of https://github.com/microhackaton/facebook-collector

Conflicts:
	src/main/resources/application.properties