Minor changes
Merge branch 'master' of github.com:cparaskeva/CCommunity

Conflicts:
	wp-content/uploads/2013/12/logo1-150x111.png
	wp-content/uploads/2013/12/logo1-300x83.png