Server plugin was added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/ndexbio/rest/ServerPlugin.java
	src/main/java/org/ndexbio/rest/domain/XUser.java
	src/test/java/org/ndexbio/rest/service/NdexGroupServiceTest.java