[TEMP]
Merge branch 'master' of https://github.com/pjhjohn/likelion_ai

Conflicts:
	application/controllers/test.py
	application/lib/game/record.py
[Release Ver 1.3] Minor Bugfix