Merge pull request #6 from LexiconNetworksPvtLtd/master

update
local commit
Merge github.com:Sanket792/prjtrail

Conflicts:
	.gitignore
	GitTrail/apps/Team/application-descriptor.xml
	GitTrail/apps/Team/common/index.html
Merge pull request #11 from Sanket792/master

initial
Merge pull request #12 from LexiconNetworksPvtLtd/for-sanket

From sanket