simplify
add redstone jar for xmlrpc
add additional depends to pom
sync up depends in project too
Merge commit '1c19b48c8a6ad86be1369d489f3348ee3c978e1c'
Merge commit 'b38bbca1df0af5242d66be908d02d729f075dae1'
Merge commit '6356249744ee4f202efbc42e0cd244f3b167b438'
Merge commit 'e394d511f03737584a667919f724c45d99d445ac'

* commit 'e394d511f03737584a667919f724c45d99d445ac':
  sync up depends in project too

Conflicts:
	JustJournal.iml
	JustJournal.ipr