Merge pull request #525 from MG-RAST/develop

Various updates - see commit list.
Merge pull request #532 from MG-RAST/develop

Merge pull request #525 from MG-RAST/develop
Merge pull request #539 from MG-RAST/develop

Various updates.
Merge pull request #541 from paczian/master

fixed white eagle problem
Merge pull request #542 from MG-RAST/hotfix-3.10.1

Hotfix 3.10.1
Merge pull request #544 from paczian/master

heatmap color hotfix
Merge pull request #545 from MG-RAST/hotfix-3.3.11.2

Hotfix 3.3.11.2
added server resource
shows information about the MG-RAST server
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
added create and update to user resource
corrected indentation at resource.pm
fixed delete function in User.pm
Merge pull request #548 from paczian/master

added server resource
Reformatted comments to SQL compliant
Merge pull request #550 from danielolson5/develop

Reformatted comments to SQL compliant
removed collections from memcache
added error output for page->output when in developer mode
Merge pull request #551 from paczian/master

removed collections from memcache
Merge branch 'master' of github.com:MG-RAST/MG-RAST into hotfix-3.3.3.4
added all the user commands
user stuff
merge