updating merge conflicts for PR 289
Merge branch 'shawndwells-disa-oct2014-release-diffs'
Merge remote branch 'upstream/master'

Conflicts:
	RHEL/6/input/profiles/CSCF-RHEL6-MLS.xml
updating DISA SRG URL
updating DISA CCI
issue 341 - update DISA FSO URLs
ticket 70 - auto remove temp accounts

added CCE to account_temp_expire_date, resolves issue 70
Merge branch 'master' of github.com:shawndwells/scap-security-guide
issue 71 - RHEL7 STIG CCI-000017, inactivity expiration

- added CCE
- Moved OVAL into shared
- Updated for RHEL7, bumped OVAL version
Issue 74 - RHEL7 STIG - logon banners

Resolves https://github.com/OpenSCAP/scap-security-guide/issues/74

- Added CCEs
- Added OVAL to shared
Merge pull request #349 from shawndwells/master

ticket 70 - auto remove temp accounts
Issue 75 - limit concurrent sessions

- Added CCE
- Updated OVAL location
- Updated OVAL CPE

resolves https://github.com/OpenSCAP/scap-security-guide/issues/75
Merge pull request #348 from shawndwells/issue341-DISA_CCI

[bugfix] Issue 341 - update DISA URLs
Update no_shelllogin_for_systemaccounts.xml

Regex matches gid < 500, instead of uid < 500 as it should.  

Changed the order of the uid and gid match regexes chunks so that it matches the accounts with uid < 500 instead of the current match of gid < 500.
Merge pull request #354 from rrenshaw/sysaccount_user_lt_500

Update no_shelllogin_for_systemaccounts.xml
Merge pull request #352 from shawndwells/issue75

Issue 75 - limit concurrent sessions
Merge pull request #350 from shawndwells/issue71

issue 71 - RHEL7 STIG CCI-000017, inactivity expiration
Merge pull request #351 from shawndwells/issue74

Issue 74 - RHEL7 STIG - logon banners