debug
Merge branch 'master' into day

Conflicts:
	src/uk/co/fuuzetsu/wetting/EntryActivity.java
swiiiipe
Merge branch 'master' of github.com:ShanaTsunTsunLove/wetting