Added main Function
Merge remote-tracking branch 'origin/localchanges'

Conflicts:
	demo/demo-war/src/main/java/com/k/gitapp/demo/DemoTest.java