PTZ Test.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/javascripts/home.js.coffee
	app/views/home/index.html.erb
PTZ Test.