Admin area development - Pages module
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/Modules/Pages/Templates/Admin/add.html