grunt update, minor concatonation change
Merge origin/master

Conflicts:
	dist/js/p3.lib.js