Last commit
Merge branch '2014-08-technical-costa-rica' of github.com:/CLEARCORP/trainings into 2014-08-technical-costa-rica

Conflicts:
	diego_dev/diego_dev.pyc