added category and subcategory skeleton
added utf-8 support
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	config/database.yml
latest changes from work