Merge branch 'qa' into development
Merge branch 'development' of github.com:reharik/KnowYourTurf into development
who the fuck knows
Merge branch 'production' into qa

* production:
  changed a dll
  added ajax.min ref
Merge branch 'qa' into development

* qa:
  changed a dll
updated all grids to search properly
committing before I branch and rename company
should be done
Merge branch 'renamecompany' into development

* renamecompany:
  should be done
added loginstats, renamed company, fixed very ugly bug in addusertoviewmodel
Merge branch 'development' of github.com:reharik/KnowYourTurf into development
deleted old gitconfig
messed with migrator to make it work
added color to equipmenttype and start end date to task report
fixed weather. and a couple other bugs. worked on gd reports
changed build proj
Merge branch 'development' into qa

* development:
  changed build proj
  fixed weather. and a couple other bugs. worked on gd reports
  added color to equipmenttype and start end date to task report
  messed with migrator to make it work
  deleted old gitconfig
  added loginstats, renamed company, fixed very ugly bug in addusertoviewmodel
  should be done
  committing before I branch and rename company
  updated all grids to search properly
  who the fuck knows
.gitignore is now working
not sure just some tweaks
Merge branch 'development' into qa

* development:
  not sure just some tweaks
  .gitignore is now working