Merge remote-tracking branch 'origin/master'

Conflicts:
	MusicGenre/bin/classes/com/genremusic/genremusic/Activity_Main.class
	MusicGenre/src/com/genremusic/genremusic/Activity_Main.java
y