Added Preferences activity (still crashes)
Added preferences.xml
Fixed intent in MainActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	bargainhunterandroid/src/main/java/com/bargainhunter/bargainhunterandroid/MainActivity.java