fixed a bug with catalogpage
Merge branch 'master' of https://github.com/carlosjgm/ICOM-5016-Project

Conflicts:
	src/appjs/app.js
Merge branch 'master' of https://github.com/carlosjgm/ICOM-5016-Project

Conflicts:
	TODO.txt