no message
Merge branch 'master' of https://github.com/Soletic/Soletic

Conflicts:
	footer.php
	functions.php
	header.php
	lib/member.php
	lib/page.php
	lib/project.php
	members.php
	page.php
	projects.php
	resources/public/css/commons.css
	resources/public/css/typography.css
	resources/public/images/body-bg.png
	resources/public/images/contact-card-bg.jpg
	resources/public/js/application-soletic.js
	resources/public/js/plugins/gallery.jquery.js