Build file.
Merge branch 'master' of github.com:crisstanza/my-initial-context

Conflicts:
	build.xml