test
Merge branch 'master' of https://github.com/Alivebox/AliveTracker2.0

Conflicts:
	framework
	resources/theme/app.css
commit after merge
update .gitignore file
remove debugger break point
add view/css* files
commit after merge
Merge branch 'master' of https://github.com/Alivebox/AliveTracker2.0
commit views merge
commit after merge - resolve conflicts
ignore .sass-cache
commit .sass-cache
just one call to register and login
implementation - set password
add validation on PasswordVerification custom component
change bussiness logic about forgot password - missing css style