refactoring
Merge branch 'master' of github.com:mahmoodramzani/20121228

Conflicts:
	Statistics/Lib/Enums.cs
conflict