Merge branch 'dev' into androdi-l-dev

Conflicts:
	src/com/money/manager/ex/fragment/InputAmountDialog.java