Merge pull request #31 from eanplatter/master

Merge new views and directives
Merge pull request #32 from eanplatter/master

adding mentorqueueview
updates queue view for mentors
Merge Conflict in queue
Reorganizes routes and file structure
merged file structure changes