changed layout of pages
Merge branch 'master' of git://github.com/jgonzalez5/CommuniTrade

Conflicts:
	log/development.log