added first (fairly dirty) implementation of swiping between images
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
forgot to commit getActionBar().setDisplayHomeAsUpEnabled(true);
Merge remote-tracking branch 'origin/master'

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