change jquery version
Merge remote-tracking branch 'upstream/master'
add Article module and markdown module
for themes
add user and article for server modules
add admin module
test
marge