preparations for angular-ui-router
Merge branch 'master', remote branch 'origin'