Now properly deletes temp uploaded file during module import
Update mediaelement.js (media player library) to v 2.14.0
Fixes/changes theme custom user profile extension view templates override system templates
Update mediaelement.js (media player library) to v 2.14.2, tinymce (wysiwyg editor) to v4.0.21, & colorbox (jquery lightbox plugin) to v1.5.6
Changes elFinder so only admins can see avatars & uploads folders, adds some comments to templates related files
Now allows for framework based (bootstrap) product view template variations
Cleans up template code somewhat by moving methods into expTemplate subsystem and adds more checks for framework variation view templates, esp for global views (queue & maintenance)
Merge branch 'develop' into bootstrap3dave

Conflicts:
	framework/core/forms/form.php
	framework/modules/forms/controllers/formsController.php
	framework/plugins/block.form.php
Few additonal tweaks to get bootstrap3 stuff merged correctly
Merge branch 'bootstrap3dave' into bs3newui

Conflicts:
	framework/plugins/block.form.php
Few additonal tweaks to get bootstrap3 stuff to work with newui