2014/05/16
Merge branch 'master' of https://github.com/kingboyrang/HsinchuElderly

Conflicts:
	HsinchuElderly/BasicViewController.h
	HsinchuElderly/BasicViewController.m