honor closebuttoncaption option, otherwise use image
distinguish between toolbar and location bar when parsing options and laying out view
refactor feature parsing
more refactoring and a start on toolbar position
Revert "refactor feature parsing"

This reverts commit 9bccdf128a10cddc15e27727d57f92911ec92d6a.

Conflicts:
	src/android/InAppBrowser.java
more refactoring
color controls when coloring toolbar
add textual nav option, and a bit of refactoring
have hardware back button go back in web history, if available
various refactorings
add option for close button position