AIOPS-9:  updated app instance to ai-dev
Merge branch 'version3' of https://github.com/umohi/activityinfo into version3

Conflicts:
	server/pom.xml