Develop system admin page, search
Merge branch 'master' of github.com:chrisjbaik/sawadicop

Conflicts: