Work on Page class
Merge branch 'master' of https://github.com/FusionClock/lilith-web-app

Conflicts:
	app/index.php