edit page push 1
add new files
add error.php page
fixing bootstrap layout stacking
Merge branch 'ktaboh'
adding bootstrap layout
new verison, all modules connected
new verison, all modules connected
Merge branch 'yi_connection'
bug fix 1
Merge branch 'master' into aciampi

Conflicts:
	addEvent.php
	addScanner.php