Update .gitignore
Add database.template.php
asset-pipeline
Update .gitignore
Delete crowdflower.csv
Update .gitignore
Update .gitignore
Add app/storage/temp .gitignore
Fix environments
gitignore, batch
Merge branch 'master' of https://github.com/khamkham/crowd-watson into arne

Conflicts:
	.gitignore
	app/config/database.template.php
	app/storage/.gitignore