Merge remote-tracking branch 'strongd/master' into merger

Conflicts:
	offbudget/log.roo
	offbudget/src/main/java/edu/unlv/kilo/domain/ItemEntity.java
	offbudget/src/main/java/edu/unlv/kilo/domain/TransactionEntity.java
	offbudget/target/classes/META-INF/aop-ajc.xml
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment_Roo_Configurable.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment_Roo_JavaBean.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment_Roo_Jpa_ActiveRecord.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment_Roo_Jpa_Entity.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemAdjustment_Roo_ToString.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity_Roo_Configurable.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity_Roo_JavaBean.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity_Roo_Jpa_ActiveRecord.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity_Roo_Jpa_Entity.class
	offbudget/target/classes/edu/unlv/kilo/domain/ItemEntity_Roo_ToString.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_Configurable.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_JavaBean.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_Jpa_ActiveRecord.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_Jpa_Entity.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_Serializable.class
	offbudget/target/classes/edu/unlv/kilo/domain/MoneyValue_Roo_ToString.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_Configurable.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_JavaBean.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_Jpa_ActiveRecord.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_Jpa_Entity.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_Serializable.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionDescription_Roo_ToString.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity_Roo_Configurable.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity_Roo_JavaBean.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity_Roo_Jpa_ActiveRecord.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity_Roo_Jpa_Entity.class
	offbudget/target/classes/edu/unlv/kilo/domain/TransactionEntity_Roo_ToString.class
	offbudget/target/classes/edu/unlv/kilo/web/ApplicationConversionServiceFactoryBean.class
	offbudget/target/classes/edu/unlv/kilo/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.class
	offbudget/target/classes/edu/unlv/kilo/web/MainController.class
	offbudget/target/classes/edu/unlv/kilo/web/MainController_Roo_Controller.class
	offbudget/target/classes/edu/unlv/kilo/web/TaggingController.class
	offbudget/target/m2e-wtp/web-resources/META-INF/maven/edu.unlv.kilo/offbudget/pom.properties