Signed-off-by: Han Manjong <han@manjong.org>
Merge branch 'master' of
https://github.com/iBluemind/flag_daily_stamp.git

Conflicts:
	src/kr/happython/flag/MainActivity.java
	src/kr/happython/flag/SelectCharacterActivity.java


Signed-off-by: Han Manjong <han@manjong.org>
Merge branch 'master' of https://github.com/iBluemind/flag_daily_stamp.git
Signed-off-by: Han Manjong <han@manjong.org>
Merge branch 'master' of
https://github.com/iBluemind/flag_daily_stamp.git

Conflicts:
	res/layout/activity_add_goal.xml
	res/layout/activity_login.xml
	src/kr/happython/flag/MainActivity.java
	src/kr/happython/flag/util/GoalListViewAdapter.java


Signed-off-by: Han Manjong <han@manjong.org>
no message