Merge branch 'master' of https://code.grnet.gr/git/aquarium

diff --cc src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index f969671,7316fc7..b8f5156
--- 1/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
--- 2/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@@ -40,38 -40,31 +40,31 @@@ package use
  import gr.grnet.aquarium.util.date.TimeHelpers
  import gr.grnet.aquarium.service.event.BalanceEvent
  import gr.grnet.aquarium.event.model.im.IMEventModel
- import message._
- import config.AquariumPropertiesLoaded
- import config.InitializeUserActorState
- import event.ProcessIMEvent
- import event.ProcessResourceEvent
+ import gr.grnet.aquarium.actor.message.config.AquariumPropertiesLoaded
+ import gr.grnet.aquarium.actor.message.config.InitializeUserActorState
+ import gr.grnet.aquarium.actor.message.event.ProcessIMEvent
+ import gr.grnet.aquarium.actor.message.event.ProcessResourceEvent
  import gr.grnet.aquarium.util.{LogHelpers, shortClassNameOf}
- import gr.grnet.aquarium.{Aquarium, AquariumInternalError}
+ import gr.grnet.aquarium.AquariumInternalError
  import gr.grnet.aquarium.computation.BillingMonthInfo
- import gr.grnet.aquarium.charging.state.UserStateBootstrap
- import gr.grnet.aquarium.charging.state.{WorkingAgreementHistory, WorkingUserState, UserStateModel}
- import gr.grnet.aquarium.charging.reason.{InitialUserActorSetup, RealtimeChargingReason}
- import gr.grnet.aquarium.policy.{PolicyDefinedFullPriceTableRef, StdUserAgreement}
+ import gr.grnet.aquarium.charging.state.{WorkingUserState, UserStateModel}
+ import gr.grnet.aquarium.policy.PolicyDefinedFullPriceTableRef
  import gr.grnet.aquarium.event.model.resource.{StdResourceEvent, ResourceEventModel}
- import message.GetUserBalanceRequest
- import message.GetUserBalanceResponse
- import message.GetUserBalanceResponseData
- import message.GetUserStateRequest
- import message.GetUserStateResponse
- import message.GetUserWalletRequest
- import message.GetUserWalletResponse
- import message.GetUserWalletResponseData
- import scala.Left
+ import gr.grnet.aquarium.actor.message.GetUserBalanceRequest
+ import gr.grnet.aquarium.actor.message.GetUserBalanceResponse
+ import gr.grnet.aquarium.actor.message.GetUserBalanceResponseData
+ import gr.grnet.aquarium.actor.message.GetUserStateRequest
+ import gr.grnet.aquarium.actor.message.GetUserStateResponse
+ import gr.grnet.aquarium.actor.message.GetUserWalletRequest
+ import gr.grnet.aquarium.actor.message.GetUserWalletResponse
+ import gr.grnet.aquarium.actor.message.GetUserWalletResponseData
+ import gr.grnet.aquarium.actor.message.GetUserBillRequest
+ import gr.grnet.aquarium.actor.message.GetUserBillResponse
+ import gr.grnet.aquarium.actor.message.GetUserBillResponseData
  import gr.grnet.aquarium.charging.state.WorkingAgreementHistory
- import scala.Some
- import scala.Right
  import gr.grnet.aquarium.policy.StdUserAgreement
  import gr.grnet.aquarium.charging.state.UserStateBootstrap
 -import gr.grnet.aquarium.charging.bill.BillEntry
 +import gr.grnet.aquarium.charging.bill.{AbstractBillEntry, BillEntry}
  
  /**
   *