Updated project information
Merged
Merged
Merge branch 'master' of
https://github.com/robaone/Bootstrap-Admin-Template

Conflicts:
	MicroMonitor/.classpath