Signed-off-by: lokesh <yokesh.ganesan@gmail.com>
Merge branch 'master' of https://github.com/yokesh28/screative.git

Conflicts:
	page.php
Merge branch 'master' of https://github.com/yokesh28/screative.git