minor changes
merge pull
latest pull
added distinct formulas view to users
merge pull