Update application/layout to twbs3
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411

Conflicts:
	app/views/layouts/application.html.haml
Add nav_link helper for link highlighting.
Split locales into stock rails and application specific files.
use bootstrap popover for todos
Alias User#to_s to #display_name.
Add user/profile header section.
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411

Conflicts:
	app/helpers/application_helper.rb
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411

Conflicts:
	app/views/layouts/application.html.haml
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411
Add translation for Admin model.
Merge pull request #82 from tstangenberg/features/ruby_212_rails_411

added teacher navigation spec
use glyphicons
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411
Fix show_form breaking for long labels.
Merge branch 'features/ruby_212_rails_411' of github.com:panterch/future_kids into features/ruby_212_rails_411
Fix layout breaks for comments.
added 0, 1 and n students assigned scenario
Merge remote-tracking branch 'upstream/features/ruby_212_rails_411' into features/ruby_212_rails_411
updated successful login story