fixed admin page
added to the todo list
remove db info from repo
Merge branch 'master' into dev

* master:
Merge branch 'master' into dev

Conflicts:
	.gitignore
	review/content/todo.md
remove markdown php
Merge branch 'dev'