smartadmin layout
fixed conflicts with prototype en jquery
Merge branch 'smart-test' into 2.0