webpack first try with no success
use requirejs to build some modules
Merge branch 'master' into webpack
change requirejs build path to ./build/
Merge branch 'webpack'

Conflicts:
	Gruntfile.js
add grunt build and build in travis before pushing