2015 values
Merge branch 'feature/upgrade_dependencies' into feature/2015
Merge branch 'feature/upgrade_dependencies' into feature/2015

Conflicts:
	app/views/layouts/2014.html.haml
remove 2014 stuff
we're now in 2015 with a 2015 theme, remove mobile stuff
what do we want "Compass" when do we want it? "Now"
First pass translation
remove old useless rake task
system reset functionality
first line styleshhet
staging sync
countdown clock
starting a print stylesheet...
layouts shouldn't render on things that are not html
Merge branch 'feature/upgrade_dependencies' into feature/2015
correct year in deploy script
reset sales task
Merge branch 'hotfix/fix_user_order_redirection_error'
Merge branch 'develop' into feature/2015

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/admin.css.scss
	app/assets/stylesheets/sc2014.css.scss
	app/views/layouts/2014.html.haml
	config/deploy/production.rb
	script/sync
Merge branch 'release/2014-final-no-really'