merging
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into remotes/origin/milestone6

Conflicts:
	index.jag
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into remotes/origin/milestone6