reverting alerts api
Merge develop - Deploy at 2014-08-18-15:26:55 by ShaharKedar