Merge pull request #12 from DEVELDESK/master

SMEserver.git.git
Merge pull request #13 from DEVELDESK/smeserver-git.git

Merge pull request #12 from DEVELDESK/master
Merge pull request #14 from DEVELDESK/master

TeamMentor