Changes
Merge branch 'development' of https://github.com/budgebi/mhacks-hack into development

Conflicts:
	Loanly/bin/resources.ap_
Merge branch 'development' of https://github.com/budgebi/mhacks-hack into development