fix #63 - use colorbox for session expired alert
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	app/controllers/sessions_controller.rb
add test for sessions#layout
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
images repaired
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release