initial commit after repo pull
added jquery blockui
fixed permission
fixed conflicts