database.yml deleted and gitignore updated to to ignore database.yml
Merge branch 'dev' into production
Merge branch 'dev' into production
Merge branch 'dev' into production
Merge branch 'dev' into production
Merge branch 'dev' into production
smtp gmail setup
smtp mandrill setup
Merge branch 'dev' into production

Conflicts:
	config/environments/production.rb
Merge branch 'dev' into production

Conflicts:
	config/environments/production.rb
Merge branch 'dev' into production
master gitignore updated so that no asset file gets merged into master branch
Merge branch 'production'
assets files deleted from master branch
Merge branch 'dev' into production
production branch gitignore can now contain database.yml
database.yml added
Merge branch 'dev' into production
Merge branch 'production'

Conflicts:
	.gitignore
	public/assets/active_admin-95731ab7b8a7f0c02b524100dbbc30a3.js.gz
	public/assets/active_admin-f6eab3903eabe26e294bb5e070593cb6.css.gz
	public/assets/active_admin.css.gz
	public/assets/active_admin.js.gz
	public/assets/active_admin/application-d31ffa222316df652837646af3e403ab.js.gz
	public/assets/active_admin/application.js.gz
	public/assets/active_admin/pages/application-9af60de6144c6790ee1f19148683fb32.js.gz
	public/assets/active_admin/pages/application.js.gz
	public/assets/active_admin/print-e2186aeecceb677443527e791ac876ed.css.gz
	public/assets/active_admin/print.css.gz
	public/assets/application-2a161655cc8607970f51c2d0044c312a.css.gz
	public/assets/application-701c00bd6cb4dd46fb837f9ff8c9b7da.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
gitignore updated for not to add public assets