beginning of cms
Merge branch 'master' into cms
Merge branch 'master' into cms
beginning of cms branch
cms theme uses bootstrap now
admin with bootstrap
updates
Merge branch 'ajde' into cms
yes
changes
latest
Merge branch 'ajde' into cms

Conflicts:
	src/private/application/modules/_core/res/js/crud/list.js
	src/private/application/modules/user/res/js/register.js
	src/private/application/modules/user/template/register.phtml
	src/private/lib/Ajde/Crud/Field/Date.php
new array format
some layout things
chosen
media start
use fineuploader
media type
embed
cms