Signed-off-by: YuenYuenWong <sharawongw@gmail.com>
Merge branch 'master' of https://github.com/HCI-webdesigner/MultiCMS

Conflicts:
	Views/templates/addTags.html
	Views/templates/main.html