m.
changes.
Merge branch 'master' of https://github.com/arnoldgamboa/amtgipad

Conflicts:
	js/json_request.js