fix doctype, and bower path after merge (master)