PRT AJAX
Merge branch 'master' of https://github.com/80xer/tgApp

Conflicts:
	app/scripts/controllers/main.js
	lib/routes.js
residence에 google places api 적용
about box 조금 수정
-- todo: x-editable 적용