servidor online
Merge remote-tracking branch 'origin/master'

Conflicts:

	AndroidBuildingMusicPlayer/AndroidBuildingMusicPlayer/src/com/androidhive/musicplayer/AndroidBuildingMusicPlayerActivity.java
Merge branch 'master' of https://github.com/andersonalmada/app