ok
Merge remote-tracking branch 'refs/remotes/develop/master'

Conflicts:
	app/ctrlIndex.php
	css/index.css
	index.php
	lib/base.php
	lib/db.php
	tpl/404.php
	tpl/add.php
	tpl/editprofile.php
	tpl/login.php
	tpl/main.php
	tpl/pagination.php
	tpl/posts.php
	tpl/profile.php
	tpl/register.php