Reducing the timeout
Getting wifi mac
Merge branch '1.0.0' of https://github.com/WSO2Mobile/mdm into 1.0.0

Conflicts:
	sqlscripts/mysql.js