Merge pull request #1 from joanrm20/master

base project
Merge pull request #2 from joanrm20/master

New directive logic
Merge pull request #3 from joanrm20/master

Add dashboard GUI,fix some services issues, improve js template file
Merge pull request #4 from joanrm20/master

CodeUpdate
Git: ignore IntelliJ and log files
Ruby: add rvmrc config
Change the module name from 'gRockit' to 'grockit'
Git: remove bower_components from repository
Merge remote-tracking branch 'upstream/master'

Conflicts:
	angular_webApp/src/styles/main.scss