add screen and active screen
Merge branch 'master' of https://github.com/kynan/beakon

Conflicts:
	views/index.html