Fix with MainCtrl
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Angular modules
Merge remote-tracking branch 'origin/master'