merged adpage.jsp and adpageEdit.jsp
adpage edit change to mode added
Merge remote-tracking branch 'origin/master' into flo
Adpage update - included div for picture upload
Merge branch 'flo'