cleanup
Merge branch 'master' of https://github.com/welvet/rp

Conflicts:
	riapost-core/src/process/ProcessManager.java
Merge branch 'master' of https://github.com/welvet/rp

Conflicts:
	riapost-core/src/process/ProcessManager.java
security