merge
Merge branch 'fmt' of https://github.com/ethertank/modest_themes into ethertank-fmt

Conflicts:
	404.php
	admin/admin.css
	allfeeds.php
	allposts.php
	archive.php
	author.php
	comments.php
	developer.php
	event-list.php
	footer.php
	functions.php
	index.php
	links.php
	page.php
	project-list.php
	rtl.css
	search.php
	sidebar.php
	single-contact_page.php
	single-event.php
	single-project.php
	single.php
	style.css