remove trash
some changes
micfont added
remove trash
update validates on models
some refactoring
good local to layouts
better locales
good locales on some views
good locales on all models
replace generators
some formatting
Merge branch 'to_release-1.4' into feature

Conflicts:
	app/views/welcome/index.html.haml
	test/functional/reports_controller_test.rb
Merge branch 'release-1.3.3'

Conflicts:
	app/views/news/show.html.haml
remove trash