Merge remote-tracking branch 'refs/remotes/origin/master' into services

# Conflicts:
#	lib/addPost/add_song_post_page.dart
#	lib/dashBoard/dash_board_page.dart
#	lib/dashBoard/songPost/song_player.dart
#	lib/dashBoard/songPost/song_post.dart
#	lib/dashBoard/songPost/song_post_detail_page.dart
#	lib/home_page.dart
#	lib/songPost/add_song_post.dart