Merge branch 'master' of https://github.com/debug-Lift/max.git

Conflicts:
	WebRoot/js/requestMethod.js
Merge branch 'master' of https://github.com/debug-Lift/max.git