Merge branch 'example'
++version
working on elevator example
Merge branch 'master' into example

Conflicts:
	app/example/index.html
	app/example/src/main.js
	app/example/src/views/elevator.js
	app/example/src/views/floor.js
	app/example/templates/floor.html