handle all version(s) as strings, and change java to 1.7
Merge branch 'wip-2.0' of git://github.com/brutall/brut.apktool into brutall-wip-2.0
knock version back to 1.6
Fixed "b -d" if there are .parameter directives with defined names (e.g.: .parameter "foo")