Merge pull request #19 from kloseking7/master

alex_pull
Merge pull request #21 from kloseking7/master

Alex Pull
restructured code
fixed broken service
1. refactor code.
2. added default data for role and user.
enhancement to menu
nothing
fixed menu issue.
code improvements
commit
nothinkg
Merge remote-tracking branch 'upstream/master'
entity_done + phone