Changes from prod server
Merge branch 'master' of https://github.com/knownasilya/Burstcreations

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/router.js
	app/assets/stylesheets/style.css
	app/models/admin.rb
	app/views/static/anna.html.erb
	config/environments/production.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	db/schema.rb
	script/rails