Merge lp://staging/~emmanuel-florent/financisto/financisto1.6.7enhanced into lp://staging/~financisto-dev/financisto/trunk

.bzrignore (+5/-1)
.idea/ant.xml (+0/-7)
.idea/compiler.xml (+0/-31)
.idea/copyright/gpl2.xml (+0/-9)
.idea/copyright/profiles_settings.xml (+0/-7)
.idea/dictionaries/solomonk.xml (+0/-7)
.idea/encodings.xml (+0/-5)
.idea/misc.xml (+0/-39)
.idea/modules.xml (+0/-12)
.idea/scopes/scope_settings.xml (+0/-5)
.idea/sqldialects.xml (+0/-20)
.idea/uiDesigner.xml (+0/-125)
.idea/vcs.xml (+0/-7)
Financisto.iml (+0/-222)
google-play-services_lib/google-play-services_lib.iml (+0/-29)
project.properties (+1/-1)
robotium_tests/robotium_tests.iml (+0/-33)
src/ru/orangesoftware/financisto/activity/FlowzrSyncActivity.java (+17/-3)
src/ru/orangesoftware/financisto/db/MyEntityManager.java (+2/-0)
src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncEngine.java (+106/-46)
src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncTask.java (+14/-1)
src/ru/orangesoftware/financisto/model/Budget.java (+1/-1)
src/ru/orangesoftware/financisto/service/FinancistoService.java (+0/-2)
tests/project.properties (+1/-1)
tests/src/ru/orangesoftware/financisto/export/FlowzrIntegrationTest.java (+480/-0)
tests/src/ru/orangesoftware/financisto/test/CategoryBuilder.java (+1/-1)
tests/tests.iml (+0/-22)