Restore
Merge branch 'master' of https://github.com/Smoothemes/easypress

Conflicts:
	index.php