boiler plate
Merge branch 'master' into angularjs-routes