Merge branch 'dev'
Source push
Merge branch 'dev' of https://github.com/Saartje87/pbjs-0.6

Conflicts:
	dist/pbjs.js
	dist/pbjs.min.js
Merge branch 'master' of github.com:Saartje87/pbjs-0.6
Merge branch 'dev'

Conflicts:
	dist/pbjs.js
	dist/pbjs.min.js