chanded the ammount of deciamal points to 2 for filesize of image
moved BASE_THUMBNAIL_SIZE to integers.xml
back and up buttons work now!
	modified:   nomacs/src/org/nomacs/android/nomacs/ImageActivity.java
	modified:   nomacs/src/org/nomacs/android/nomacs/ImageBrowserActivity.java
	modified:   nomacs/src/org/nomacs/android/nomacs/ImageBrowserActivity.java
Merge branch 'developer' into swiping-test

Conflicts:
	nomacs/src/org/nomacs/android/nomacs/ImageBrowserActivity.java
Merge branch 'developer' into swiping-test

Conflicts:
	nomacs/src/org/nomacs/android/nomacs/ImageBrowserActivity.java
Merge branch 'developer' into swiping-test

Conflicts:
	nomacs/src/org/nomacs/android/nomacs/ImageBrowserActivity.java