"Resolution" changes
Add zoom indicator and iteration control
Netbeans .gitignore stuff
Merge origin/master