Better comments, cleaned up, removed unnecessary code and formatted
Merge branch 'sqlite_data'

Conflicts:
	src/se/turbotorsk/mybar/model/Data.java
	src/se/turbotorsk/mybar/model/Drink.java
	src/se/turbotorsk/mybar/model/Ingredient.java
	src/se/turbotorsk/mybar/model/MyBar.java
	src/se/turbotorsk/mybar/model/database/DrinkTable.java
	src/se/turbotorsk/mybar/model/database/IngredientTable.java
	src/se/turbotorsk/mybar/model/database/MyBarContentProvider.java
	src/se/turbotorsk/mybar/model/database/MyBarDatabaseHelper.java
	src/se/turbotorsk/mybar/model/database/MyBarTable.java
Quickfix license
Added UML for packages
Merge branch 'master' of
https://github.com/TeamLegendaryAwesome/WYSIWYD.git

Conflicts:
	src/se/turbotorsk/mybar/model/Data.java
	src/se/turbotorsk/mybar/model/Drink.java

Added support for drink pre view
Syncsupport added.
Merge branch 'master' of https://github.com/TeamLegendaryAwesome/WYSIWYD.git
Moved sync method to splash
Updated docs (Added SDD)

merged SDD with def. of app. packages
Controller updated.
changed value of splash length
Merge branch 'master' of https://github.com/TeamLegendaryAwesome/WYSIWYD.git
fixed setrating methods
Modified splash slightly
Massive testing/robotium commit

Seems like there is some error. "Test failed to run to completion.
Reason: 'Instrumentation run failed due to 'Process crashed.''. Check
device logcat for details". Didnt get that before, have to try it out
more at home.
Added license and minor changes
Added JUNIT testing for MyBarContentProvider Inserts, Updated, Deletes.
Fixed a bad merge and replaced with correct files. Fixed JSON's license.
Emergency fix
Merge branch 'sqlite_test'