Merge remote-tracking branch 'remotes/origin/dev' into androdi-l-dev

Conflicts:
	src/com/money/manager/ex/fragment/SearchFragment.java
	src/com/money/manager/ex/preferences/PreferencesActivity.java