Updated: More robust asset parsing in production mode
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/main.js
More robust asset parsing in production mode
Merge pull request #26 from dominiklessel/master

More robust asset parsing in production mode