- All changes to PO and POT files from nut_arulir_mountain ignored, used the ones from AndorsTrailRelease_master because they contain the latest changes
- Small changes to authors.xml from nut_arulir_mountain ignored, used the ones from AndorsTrailRelease_master and checked that everything is there
- Current version display contains "dev". This has to be changed for the release
# Conflicts:
# AndorsTrail/AndroidManifest.xml
# AndorsTrail/assets/translation/ar.po
# AndorsTrail/assets/translation/bg.po
# AndorsTrail/assets/translation/ca.po
# AndorsTrail/assets/translation/cs.po
# AndorsTrail/assets/translation/de.po
# AndorsTrail/assets/translation/el.po
# AndorsTrail/assets/translation/english.pot
# AndorsTrail/assets/translation/es.po
# AndorsTrail/assets/translation/es_AR.po
# AndorsTrail/assets/translation/fi.po
# AndorsTrail/assets/translation/fil.po
# AndorsTrail/assets/translation/fr.po
# AndorsTrail/assets/translation/fr_AG.po
# AndorsTrail/assets/translation/gl.po
# AndorsTrail/assets/translation/hu.po
# AndorsTrail/assets/translation/id.po
# AndorsTrail/assets/translation/it.po
# AndorsTrail/assets/translation/ja.po
# AndorsTrail/assets/translation/ko.po
# AndorsTrail/assets/translation/ms.po
# AndorsTrail/assets/translation/nb.po
# AndorsTrail/assets/translation/nl.po
# AndorsTrail/assets/translation/pa.po
# AndorsTrail/assets/translation/pl.po
# AndorsTrail/assets/translation/pt.po
# AndorsTrail/assets/translation/pt_BR.po
# AndorsTrail/assets/translation/ru.po
# AndorsTrail/assets/translation/sl.po
# AndorsTrail/assets/translation/sv.po
# AndorsTrail/assets/translation/th.po
# AndorsTrail/assets/translation/tr.po
# AndorsTrail/assets/translation/uk.po
# AndorsTrail/assets/translation/zh_CN.po
# AndorsTrail/assets/translation/zh_TW.po
# AndorsTrail/res/values/authors.xml
# AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java