removed conflict
Merge branch 'UAT'
Commented send mail funciton
Merge branch 'master' of https://github.com/subodh4codaemon/redlemon

Conflicts:
	application/views/sweepstakes/ajax_overview.php
conflict resolved
Edit configuration management and basic inforamation
edit registration fields
edit sweepstake fields
Edit sweepstakes configuration
View stat
Conflicts resolved
Merge branch '93.2-sweepstakes-edit' of https://github.com/sabahulh/redlemon into 93.2-sweepstakes-edit

Conflicts:
	application/controllers/sweepstakes/manage_sweepstakes.php
	application/views/sweepstakes/edit/registration_page.php
Integrated with aparans code
Configuration Management suggetion implementation
edit sweepstakes
Merged with aparnas branch
manage sweepstakes
sweepstakes js issues resolved
half registration cron job
edit sweepstake