fix
Merge branch 'master' of https://github.com/illyfrancis/pecuniary

Conflicts:
	api/pom.xml
	api/src/main/db/data2/data.zip
	api/src/main/db/data2/export-all.bat
	api/src/main/java/com/bbh/openbbh/api/dao/Accounts.java
	api/src/main/java/com/bbh/openbbh/api/dao/MongoDB.java
	api/src/main/java/com/bbh/openbbh/api/dao/Transactions.java
	api/src/main/java/com/bbh/openbbh/api/resource/AccountResource.java
	api/src/main/java/com/bbh/openbbh/api/resource/TransactionResource.java
	api/src/main/webapp/WEB-INF/web.xml