updating
Merge branch 'master' of git://github.com/jgonzalez5/CommuniTrade

Conflicts:
	db/development.sqlite3