created service methods and implementations, and stubbed cal service
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	public/index.html
	public/js/controllers/hardwareEnvironmentController.js
merge changes