Prepare porduction branch
Prepare porduction branch 2
General code refactoring
Merge branch 'master' of github.com:dexxxxxter/CrossFit into production

Conflicts:
	config/database.yml