activator new and add grunt and bower
Merge branch 'origin_master'