Added travis integration and merged conflicts
Merge branch 'develop' of github.com:ironjan/metal-only into develop

Conflicts:
	src/main/java/com/codingspezis/android/metalonly/player/favorites/SongAdapterFavorites.java