Merge branch 'master' of git://github.com/povieira/gae-boilerplate into povieira-master

Conflicts:
	locale/pt_BR/LC_MESSAGES/messages.mo