Merge pull request #24 from rosemarybeetle/dev

Update Master with latest stable dev version
Merge pull request #28 from rosemarybeetle/dev

Update master with latest changes
Merge pull request #34 from rosemarybeetle/dev

Update with admin stuff
Merge pull request #41 from rosemarybeetle/dev

Update Master with latest stable dev version
Merge pull request #44 from rosemarybeetle/dev

Update Master with latest stable dev version
Merge pull request #47 from rosemarybeetle/dev

Update Master with latest stable dev version
Merge pull request #48 from rosemarybeetle/dev

latest update of master
Merge pull request #49 from rosemarybeetle/master

Latest stable version