Merge branch 'master' into feature/2_admin_posts
[#4] Backbone and turbolinks love each other now.
[#4] Full name, carrierwave and thumbnail created for Users. New can be uploaded through admin.
Merge branch 'master' into feature/2_admin_posts
Merge branch 'feature/2_admin_posts' of https://github.com/savayg/buzzstarter-training into feature/2_admin_posts
cleanup javascripts
[#2] PR comments resolved.
Merge branch 'feature/2_admin_posts' into feature/3_homepage

Conflicts:
	app/admin/post.rb
Merge branch 'feature/3_homepage' into feature/4_post_page