Initial commit
Initial commit
Initial commit
20141010 Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/supervisor_war_exploded.xml
	.idea/misc.xml
	.idea/vcs.xml
	supervisor.iml
	web/WEB-INF/web.xml
20141010 Commit