Notification sound

Added 'siren' sound file
Notification sound deprecation fixed
General update needed to continue
	deleted:    Asteroid/bin/AndroidManifest.xml
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/AsteroidInformation.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/BuildConfig.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter$DatabaseHelper.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$attr.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$drawable.class
	deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$layout.class
	deleted:    Asteroid/bin/jarlist.cache
	deleted:    Asteroid/gen/ie/ucd/asteroid/BuildConfig.java
	modified:   Asteroid/gen/ie/ucd/asteroid/R.java
	new file:   Asteroid/libs/jsoup-1.7.1.jar
	new file:   Asteroid/res/layout/activity_asteroid_info.xml
	new file:   Asteroid/res/layout/activity_dooms_day_clock.xml
	modified:   Asteroid/res/layout/activity_main.xml
	new file:   Asteroid/res/layout/activity_main_menu.xml
	new file:   Asteroid/res/layout/activity_weekly_asteroids.xml
	new file:   Asteroid/res/layout/custom_listview.xml
	new file:   Asteroid/res/menu/activity_asteroid_info.xml
	new file:   Asteroid/res/menu/activity_dooms_day_clock.xml
	new file:   Asteroid/res/menu/activity_main_menu.xml
	new file:   Asteroid/res/menu/activity_weekly_asteroids.xml
	modified:   Asteroid/res/values/strings.xml
	deleted:    Asteroid/src/ie/ucd/asteroid/AsteroidInformation.java

	Asteroid/bin/AndroidManifest.xml
	Asteroid/bin/classes/ie/ucd/asteroid/AsteroidInformation.class
	Asteroid/bin/classes/ie/ucd/asteroid/BuildConfig.class
	Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter$DatabaseHelper.class
	Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$attr.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$drawable.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$layout.class
	Asteroid/bin/jarlist.cache
	Asteroid/gen/ie/ucd/asteroid/BuildConfig.java
	Asteroid/src/ie/ucd/asteroid/AsteroidInformation.java
	new file:   Asteroid/bin/AndroidManifest.xml
	new file:   Asteroid/bin/classes/ie/ucd/asteroid/AsteroidInformation.class
	new file:   Asteroid/bin/classes/ie/ucd/asteroid/BuildConfig.class
	new file:   Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter.class
	new file:   Asteroid/bin/jarlist.cache
	new file:   Asteroid/gen/ie/ucd/asteroid/BuildConfig.java
	new file:   Asteroid/src/ie/ucd/asteroid/AsteroidInformation.java

	Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter$DatabaseHelper.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$attr.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$drawable.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$layout.class
Forced commit
Merge branch 'master' of https://github.com/dashford/asteroid

Conflicts:
	Asteroid/bin/AndroidManifest.xml
	Asteroid/bin/classes/ie/ucd/asteroid/MainActivity.class
	Asteroid/bin/classes/ie/ucd/asteroid/NotificationSettings.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$id.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$menu.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$string.class
	Asteroid/bin/classes/ie/ucd/asteroid/R$style.class
	Asteroid/bin/classes/ie/ucd/asteroid/R.class
	Asteroid/gen/ie/ucd/asteroid/R.java
	Asteroid/res/values/strings.xml
	Asteroid/src/ie/ucd/asteroid/AsteroidInformation.java

new file:   .gitignore
modified:   Asteroid/AndroidManifest.xml
new file:   Asteroid/assets/fonts/Roboto-BoldCondensedItalic.ttf
new file:   Asteroid/assets/fonts/Roboto-Condensed.ttf
new file:   Asteroid/assets/fonts/Roboto-CondensedItalic.ttf
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/AsteroidInformation.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/BuildConfig.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter$DatabaseHelper.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/DBAdapter.class
modified:   Asteroid/bin/classes/ie/ucd/asteroid/MainActivity.class
modified:   Asteroid/bin/classes/ie/ucd/asteroid/NotificationSettings.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$attr.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$drawable.class
deleted:    Asteroid/bin/classes/ie/ucd/asteroid/R$layout.class
deleted:    Asteroid/bin/jarlist.cache
deleted:    Asteroid/gen/ie/ucd/asteroid/BuildConfig.java
new file:   Asteroid/res/drawable-hdpi/asteroid_large.png
new file:   Asteroid/res/drawable-hdpi/asteroid_medium.png
new file:   Asteroid/res/drawable-hdpi/asteroid_small.png
new file:   Asteroid/res/drawable-hdpi/background_main_menu.png
new file:   Asteroid/res/drawable-hdpi/bus.png
new file:   Asteroid/res/drawable-hdpi/chance_of_impact_icon.png
new file:   Asteroid/res/drawable-hdpi/dooms_button.png
new file:   Asteroid/res/drawable-hdpi/dooms_button_clicked.png
new file:   Asteroid/res/drawable-hdpi/key.png
new file:   Asteroid/res/drawable-hdpi/key_clicked.png
new file:   Asteroid/res/drawable-hdpi/logo.png
new file:   Asteroid/res/drawable-hdpi/mini_icon_asteroid_large.png
new file:   Asteroid/res/drawable-hdpi/mini_icon_asteroid_medium.png
new file:   Asteroid/res/drawable-hdpi/mini_icon_asteroid_small.png
new file:   Asteroid/res/drawable-hdpi/notifications_icon_off.png
new file:   Asteroid/res/drawable-hdpi/notifications_icon_on.png
new file:   Asteroid/res/drawable-hdpi/splash_background.png
new file:   Asteroid/res/drawable-hdpi/weekly_button.png
new file:   Asteroid/res/drawable-hdpi/weekly_button_clicked.png
new file:   Asteroid/res/drawable/doomsday_btn.xml
new file:   Asteroid/res/drawable/weekly_btn.xml
modified:   Asteroid/res/values/strings.xml
new file:   Asteroid/src/ie/ucd/asteroid/AsteroidInfo.java
modified:   Asteroid/src/ie/ucd/asteroid/DBAdapter.java
new file:   Asteroid/src/ie/ucd/asteroid/DoomsDayClock.java
new file:   Asteroid/src/ie/ucd/asteroid/DownloadAdapter.java
modified:   Asteroid/src/ie/ucd/asteroid/MainActivity.java
new file:   Asteroid/src/ie/ucd/asteroid/MainMenu.java
modified:   Asteroid/src/ie/ucd/asteroid/NotificationSettings.java
new file:   Asteroid/src/ie/ucd/asteroid/WeeklyAsteroids.java