.
Merge branch 'master' of git@github.com:jpfaria/jblog.git

Conflicts:
	ivy.xml