update
Merge branch 'master' of https://github.com/21epub/xdad-design

Conflicts:
	html/site-xdad/css/ipad.css