Allowed tab_to to take a string
Merge branch 'master' of https://github.com/dannymcc/BaseApp2

Conflicts:
	app/helpers/application_helper.rb
Initial wave of updates to get app running on rails 4.1
Updated devise views and fix aasm deprecation warnings
Complete upgrade to Rails 4 using existing codebase
WIP - Move to asset pipeline
Move completely to asset pipeline
Merge pull request #33 from codenamev/rails-4-1

Rails 4.1 Upgrade