some stuff
deleted some stuff
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting

Conflicts:
	application/controllers/password_write.php
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting
Merge branch 'master' of https://github.com/HackBCA-HighTech/HandRighting
did shit with imageanalyze (partly done) and updated php to record times