Add marker option to trap
Add Basic Bait functionality
Merge branch 'master' of https://github.com/zabbat/myth

Conflicts:
	src/net/wandroid/mythology/trap/Trap.java
	src/net/wandroid/mythology/trap/TrapInfoActivity.java