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

Conflicts:
	doc/arch/aquarium.tex

diff --cc doc/arch/aquarium.tex
index 2806ef5,d3e2f24..c6b274f
--- 1/doc/arch/aquarium.tex
--- 2/doc/arch/aquarium.tex
+++ b/doc/arch/aquarium.tex
@@@ -27,7 -27,7 +27,11 @@@
  \date{}
  
  %make title bold and 14 pt font (Latex default is non-bold, 16 pt)
++<<<<<<< HEAD
 +\title{Aquarium: An Extensible Billing Platform for Cloud Infrastructures}
++=======
+ \title{Aquarium: An Extensible Billing Platform for Cloud Applications}
++>>>>>>> 55840e27864a0f88d7c7228e663677ec72841dcc
  
  \author{
  {\rm Georgios Gousios}\\