adding time check
added timestamp
Merge branch 'master' of github.com:sohilnandu/otg_mobile_app

Conflicts:
	app/controllers/index.js
Merge branch 'franks'