Merge branch 'master' of https://github.com/jtopjian/horizon-2014.1.2

* 'master' of https://github.com/jtopjian/horizon-2014.1.2:
  Fixing whitelabel
New alert system