Merge pull request #37 from VirtualFlyBrain/Dev-Server

Updating main server with latest fixes
Merge pull request #49 from VirtualFlyBrain/master

Bring main server up to date
Merge pull request #55 from VirtualFlyBrain/master

Bring main server up to date
Merge pull request #60 from VirtualFlyBrain/master

Bring main server up to date
Merge pull request #70 from VirtualFlyBrain/master

Bring main server up to date
Merge pull request #134 from VirtualFlyBrain/master

Releasing v2.1
enabling clean install
Merge pull request #136 from VirtualFlyBrain/Main-Server

Deployed version
Merge pull request #139 from VirtualFlyBrain/master

Bringing up to date