Fix for Issue #41
Merge branch 'develop' of https://github.com/Hoanoho/hoanoho into develop

Conflicts:
	install/sql/2_insert_content.sql
Fix for Issue #41