A lot of fixes: User update & change pass, Assets, Alert widget
Merge branch 'master' of github.com:sleptor/xproject2

Conflicts:
	application/components/Alert.php
	application/models/ContactForm.php