Motion detection bug corrected
Bugs corrected
Merge branch 'master' into Andrei_new

Conflicts:
	motion_detection.html
Merge pull request #38 from clwen/Andrei_new

Andrei new