new rvm version
Merge branch 'dev' of https://github.com/engagelab/iObserveService into dev

Conflicts:
	.idea/iObserveService.iml