local changes
merge in github code
Merge remote-tracking branch 'origin/sqlserver' into sqlserver
Merge remote-tracking branch 'origin/sqlserver' into sqlserver
Merge remote-tracking branch 'origin/sqlserver' into sqlserver
Conflicts: Gemfile.lock (resolved after bundle install)
Merge branch 'sqlserver' of github.com:tayloredwebsites/tws_estimation into sqlserver
 - fixed Conflicts: Gemfile.lock
remove rdiscount for production - win/xp?