Only send email about new condition if set
Fix Conflict
Merge branch 'master' of github.com:scottwainstock/pbm
Merge branch 'master' of github.com:scottwainstock/pbm
Merge branch 'master' of github.com:scottwainstock/pbm
Merge branch 'master' of github.com:scottwainstock/pbm
Merge pull request #310 from RyanTG/master

made region nav menu into a dropdown when window is narrow
Merge pull request #311 from RyanTG/master

location picture style and mobile margin fix
Merge pull request #312 from RyanTG/master

margin adjustments for mobile
enforce sort order on high scores to avoid intermittent test failures
Merge branch 'enhancements'
Merge pull request #313 from RyanTG/master

added more t shirt sizes to store
Merge branch 'master' of github.com:scottwainstock/pbm
machine groups
Merge branch 'enhancements'
bug fix - show location region on events page in map links
Merge branch 'enhancements'
report ip address when removing a machine from the api
Merge branch 'enhancements'
stamp emails with STAGING if they are sent from the staging server