Merge pull request #10 from cbos-team/master

finishing improvements in backend
customize pages of each user level
conform layout
Merge pull request #58 from dupps/master

finishing layout