Merge branch 'development' into production
Merge branch 'qa' into production
put in sleep between calls to weather api
manually made change rather then merging for somereason
merged
merged
Merge branch 'development' into qa
changed userrole to inherit from listtype. actually already did, changed the mapping to
found error in assignalluserstousergroups that should have screwed everything but doesn't seem to
merged
merged
merged
added build sln. and buildforrelease.proj
Merge branch 'production' into qa

* production:
  added build sln. and buildforrelease.proj
  manually made change rather then merging for somereason
  put in sleep between calls to weather api
Merge branch 'qa' into development

* qa:
  added build sln. and buildforrelease.proj
  found error in assignalluserstousergroups that should have screwed everything but doesn't seem to
  changed userrole to inherit from listtype. actually already did, changed the mapping to
  manually made change rather then merging for somereason
  put in sleep between calls to weather api