switch to rails-assets
Merge branch 'master' of github.com:qsun/qsun-rails-boilerplate

Conflicts:
	app/views/layouts/application.html.erb
switch kaminari bootstrap to bs3