Merge branch 'develop' into trophies

Conflicts:
	data/challenges/10.json
	data/missions/rothan/02 - rothan defence #2.json
	locale/tbftss.pot
	src/battle/ai.c
	src/battle/battle.c
	src/battle/battle.h
	src/battle/fighters.h
	src/battle/script.c
	src/battle/script.h
	src/galaxy/mission.c
	src/galaxy/mission.h
	src/main.c
This commit is contained in:
Steve 2016-03-27 11:22:05 +01:00
commit 5d1edf89b3

Diff Content Not Available