commit
Merge branch 'master' of https://github.com/bugrayuksel/byexplorer

Conflicts:
	app/config/parameters.yml