Removed log/catamiPortal.log
Working on interface to backend for new import feature
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	log/catamiPortal.log