changes
Merge branch 'master' of github.com:brijendratiwari/new_mcwili

Conflicts:
	application/views/sync.php