Locations controller was updated
Merge branch 'master' of https://github.com/itspoma/hackathon-symphony-solutions
Merge branch 'master' of https://github.com/itspoma/hackathon-symphony-solutions
Merge branch 'master' of https://github.com/itspoma/hackathon-symphony-solutions
Conflicts resolved
Factory girl added
Merge branch 'master' of https://github.com/itspoma/hackathon-symphony-solutions

Conflicts:
	shared/symphony_hackathon/Gemfile
	shared/symphony_hackathon/app/models/task.rb