Update main property
Update bower.json
update npm dependencies
udpate button style on Tina's feedback & scss file
udpate Grunt build css files
Merge remote-tracking branch 'origin/master'