Removing Netbeans Folder
Merge branch 'master' of https://github.com/hardik-panchal/wakeup
Driver Texts
Merge branch 'master' of https://github.com/hardik-panchal/wakeup

Conflicts:
	instance/front/tpl/driver_bulk_message.php