Merge pull request #1243 from mkly/allow_additional_characters_in_file_set_names

Add Validation for Attribute Set Name
Merge pull request #1101 from synlag/patch-3

Fixing XSS
Revert errant merge
bug fixes
Merge branch 'master' of github.com:concrete5/concrete5
bug fixin
Fix install starting point after session move

Fix install starting point after session move

/startup/session.php was moved below packages for permission issues

- Change `require()` call for /startup/session.php to `require_once()`
- Add `require_once()` before `render('/install')`
Merge pull request #1244 from mkly/fix_install

Fix install starting point after session move
Fix Form Block Include In Dashboad Site Activity

Fix form block include in dashboard site activity block

- Move `Loader::block('form')` outside if `$ui` as `FormBlockStatistics'
  class is used either way
Merge pull request #1245 from mkly/fix_form_block_class_include

Fix Form Block Include In Dashboad Site Activity
Fix Area to GlobalArea Flip Flop

Fix Area to GlobalArea flip flop

If an Area is changed into a GlobalArea in a theme file, or if a new
theme is installed which has an GlobalArea with the same name as an Area
in the previous theme, the view will alternate display of the Area and
GlobalArea after every other page load.

The is true if the reverse is done and a GlobalArea is changed into an
Area of the same Name

- Add `$arIsGlobal = null` parameter to `Area::get()`
- Store seperate cache for when 1 is passed into `$arIsGlobal` to
  seperate caches
- Pass in `arIsGlobal` table field when rescanning area permissions to
  avoid filling the cache with the wrong one
Update `Area::get()` docs

Update `Area::get()` docs
Merge pull request #1246 from mkly/fix_area_global_flip_flop

Fix area global flip flop
Fix Incorrect var in SQL Loop

Fix Incorrect var in SQL Loop
Merge pull request #1247 from mkly/fix_area_global_flip_flop

Fix Incorrect var in SQL Loop
Revert Protected Properties in Select Attribute

Revert protected properties in `SelectAttributeTypeController`

Causes issues with code in the wild that attempts to carry over private
properties
Merge pull request #1248 from mkly/revert_protected_properties_in_select_attribute

Revert Protected Properties in Select Attribute
same behaviour for Page->getAttribute like we have with UserInfo->getAttribute
some documentation
Simplify AutonavBlockController::populateParentIDArray