fixing reference from "size" to "depth"
fixing a size method in the mapping
more null-related fixes for size, depth, elevation
fixing bad image removal (cherry-picking from commit 8c1b999e7b8e4f66a071edcf6eea233f94a3a35c)
restoring the sides method for Simon's research (cherry-picking from commit 25b9ce5648b9d83b054f6cc85c179bb7c4a57931)

andf part fix for issue #21 (cherry-picking from commit 85bab80799af7b0c9dba32ae9c74a382eec74072)
fixed processing of bad depths, elevs, and sizes on submit (cherry-picking from commit 5c344d0e28dec1b2c9fb95edffceaf474fc5fe95)
Restoring showProperty functions (cherry-picking from commit 0ddb5fda23a14d1b8e2e07d2a78315349aa728ab) (cherry-picking from commit 3749b8f233e0fff6b08d34d0d5c8f882cfe2142b)
fixing size-related null pointer exception in MarkedIndividual (cherry-picking from commit 5f1f2c458cbd8215e9940ca328a95c57ff0ae594) (cherry-picking from commit f9759fdec04072883e048487b8ed1c2d667f9f16)
fixing small issues (cherry-picking from commit 0cd8f629db943f30083106d1862954905d4b6265)
fixing more size/depth fields to finish converting these values for whaleshark.org, also bumping up the grid manager allowed num scanTasks (cherry-picking from commit e83d668d22c0dbe1294c8ff95aea3d9d418104c1) (cherry-picking from commit 4c64b323826e187ce19970b85f7bdc76b0c8d778)
adding qatar as a location
-fixing login code on the encounter page
-fixing Zab's reported issue that researchers could not expand images for encounters for which they do not have permissions (cherry-picking from commit 69fe1022f9aafc82a29281d3eaf82089a04e75c1) (cherry-picking from commit 512b8661635874e487f488faf4bd425b74dbd535)
-fixing login code on the encounter page
-fixing Zab's reported issue that researchers could not expand images for encounters for which they do not have permissions (cherry-picking from commit 69fe1022f9aafc82a29281d3eaf82089a04e75c1) (cherry-picking from commit 512b8661635874e487f488faf4bd425b74dbd535) (cherry-picking from commit 04d37ec5fac30c3ca2bfa477001890217328f551)
adding null pointer exception handling for elevation (cherry-picking from commit d02b4a35f907bb899ca41e661919dd87b0bdf8f0)
two minor fixes:
-unhandled Encounter.getSize() without check for null in mapping
-!loggedIn condition prevented the comments section at the bottom from displaying (cherry-picking from commit 2eb93dbcff1de1e7625017426982eeb297e4fe8b) (cherry-picking from commit a28d153f6eb58a0c884e4744c44f8e3b46110d69)
adding exception handling here to ensure at least an NPE is handled. (cherry-picking from commit 33b3fea48c68b64f3cb0f2c9354b403d86232246)
fixing the name/email string filtering for encounter searching (cherry-picking from commit 7de34f52084a56578a35c8ee3917eb297cf9a2cb) (cherry-picking from commit 887a4f2ff9ab30a88738b067c0c024bd0b32f7ad)
Adding back in the ability to multi-select and AND (rather than OR) location IDs in the Individual Search (cherry-picking from commit e8235b99b7a4d6aced02a147c12d4807ae0f4947) (cherry-picking from commit 91d3ecd421a3c9df1f09717d90151ef8e732744d)
adding version injection (cherry-picking from commit 09b9092ba6e0e1a5b22eabe7dd59292d047fb367) (cherry-picking from commit e7fb4e179c1a55d7b88918fab998cf31023db1d9)
more javadoc integration (cherry-picking from commit e0b9f38f45344166ab3ee2559d582abee95d4637)
adding javadoc (cherry-picking from commit d882495df1570eb6c07853ea0342b0d4d153f04c)
adding javadoc plug-in (cherry-picking from commit ca07817547e70d133c294b2dc6b4f4e59f5fabe4)
adding javadoc plug-in (cherry-picking from commit ca07817547e70d133c294b2dc6b4f4e59f5fabe4) (cherry-picking from commit 7588d07f9d6b7630e5cba0a704a094c249fb86e7)
adding the ability to search by fiulename and locate the corresponding encounter for a submitted photo. This was a feature request from Zab in Belize in support of uploading Rachel's data. (cherry-picking from commit b16f30057cf2f1699447ce7532ac3217b6f84a73) (cherry-picking from commit 850e7d163ad6e74bf96fed135c3f2e60c3420c90)