updating add new screen and template categories
Merge branch 'master' of https://github.com/inboundnow/landing-pages

Conflicts:
	templates/tubelar/config.php