test commit
test commit
changing the views
Merge branch 'master' of https://github.com/sankalpsingha/Teamsoft

Conflicts:
	assets/b97670d2/pager.css
	protected/runtime/application.log
Changed the Create Module View File
Changed few views
Changed