Merge pull request #1519 from mwhitneysdsu/develop

Added optional fourth parameter to timezone_menu