Directory structure changed
merge commit
changed datastore indexes file
Merge branch 'master' of https://github.com/induarun9086/SignalMapper

Conflicts:
	war/WEB-INF/classes/.gitignore