Merge branch 'production'

author Oskar Wiksten <oskar.wiksten@gmail.com>

Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)

committer Oskar Wiksten <oskar.wiksten@gmail.com>

Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)
author Oskar Wiksten <oskar.wiksten@gmail.com>
Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)
committer Oskar Wiksten <oskar.wiksten@gmail.com>
Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)
diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
Simple merge
author	Oskar Wiksten <oskar.wiksten@gmail.com>
	Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)
committer	Oskar Wiksten <oskar.wiksten@gmail.com>
	Thu, 13 Sep 2012 17:09:28 +0000 (19:09 +0200)