re-init.
Merge branch 'master' of https://github.com/ashishpok/sandbox

Conflicts:
	WebContent
init - one more time.