Access
Merge branch 'master' of https://github.com/ppetrosyan/LONI-WebST.git

Conflicts:
	LONI Pipeline Server
Terminal/src/edu/ucla/loni/pipeline/client/LONI_Pipeline_Server_Terminal.java