Some experiments with templates
Some fixes
Merge branch 'new_branch_name'

Conflicts:
	src/qml/src/newsfeedmodel.cpp