maxHeight
Merge branch 'master' of https://github.com/ShadowVision/Acumed_LibraryApp

Conflicts:
	www/index.html
Merge branch 'master' of https://github.com/ShadowVision/Acumed_LibraryApp