initial commit, laravel and bower
updated bower and grunt
merged and resolved conflict