Changed array adapter
Removed unused classes
Merge remote-tracking branch 'upstream/master'
Enhancements in .gitignore file