UPDATE:TextPage controller and model added
Merge origin/master

Conflicts:
	public/index.php
FIX: after merge
Merge origin/master

Conflicts:
	public/index.php