restructed controllers/services, fixed minify/uglify problems
Merge remote-tracking branch 'github/master'