Signed-off-by: Lois47 <collet.lois@gmail.com>
Merge branch 'master' of https://github.com/kazamafury/ter

Conflicts:
	res/layout/activity_tranquil.xml

Signed-off-by: Lois47 <collet.lois@gmail.com>