Update dev
Merge branch 'dev' of https://github.com/zpfled/guevaras into dev

Conflicts:
	development.db