Merge branch 'dev'
added admin side and user side views
Merge branch 'dev'
Merge branch 'master' into dev
Merge pull request #2 from katerman/dev

Dev