Merge remote-tracking branch 'origin/master' into stable
updating grunt to also build lib file
Updating Grunt file
Merge remote-tracking branch 'origin/stable'