add / appCtrl alias
update / directives convention names
update / compiled app.js
Merge branch 'master' into gh-pages