added fullscreen button (to be replaced by keyboard eventually), fixes
Merge branch 'master' into keyboard

Conflicts:
	app/scripts/main.js
	bower.json
merge
still can't get flight-keyboard-shortcuts working, boo.