zzxds PIg
Merge branch 'master' of https://github.com/esenti/ngj14

Conflicts:
	album.js