Merge branch 'refs/heads/dev'
Merge branch 'refs/heads/dev'
markdown, style nab to not load broken

Signed-off-by: Thad Allender <thadallender@gmail.com>
Merge branch 'refs/heads/dev'
Added check to either use array or object for font options (for defaults).

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
Options default to array, abel is in the fonts list, removed check for is_object.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
photoshelter support

Signed-off-by: Thad Allender <thadallender@gmail.com>
Merge branch 'refs/heads/dev'

Signed-off-by: Thad Allender <thadallender@gmail.com>

Conflicts:
	library/actions.php
	library/theme-customizer.php
	options.php
resolve merge conflict

Signed-off-by: Thad Allender <thadallender@gmail.com>
make font options work on theme customizer

Signed-off-by: Thad Allender <thadallender@gmail.com>
Merge branch 'refs/heads/master' into dev