refactor catalog
Merge branch 'master' of https://github.com/JasonSoft/MyGo

Conflicts:
	src/myApp/models.go