gemfile updated
twitter bootstrap update to 3.0. Custom Bootstrap without any gem.
bootstrap in vendor directory
Merge branch 'dev' into production
ignore database.yml for heroku
asset precompiled for heroku
Merge branch 'production'

Conflicts:
	.gitignore
	public/assets/active_admin-f6eab3903eabe26e294bb5e070593cb6.css.gz
	public/assets/active_admin.css.gz
	public/assets/active_admin.js
	public/assets/active_admin.js.gz
	public/assets/active_admin/application.js
	public/assets/active_admin/application.js.gz
	public/assets/active_admin/pages/application-933a377407f68bbb2ce7f673d7feca0a.js
	public/assets/active_admin/pages/application.js
	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.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/jquery.min.map
	public/assets/manifest.yml