fixing bug,
add date time picker
upgrade angular ui bootstrap
Merge branch 'master' of https://github.com/plansys/Plansys

Conflicts:
	protected/modules/admin/controllers/UserController.php
fixing bootstrap
Merge branch 'master' of https://github.com/plansys/Plansys