I can't believe it took so long to fix this.
Merge branch 'master' of github.com:Brainshots/AlarconApp