Fixing Fanny's bugs.
Merge branch 'master' of github.com:Brainshots/AlarconApp