paypal try
mcMerge branch 'master' of https://github.com/amolc/icefire

Conflicts:
	housingadmin2/js/app.js
mc