I dont really know

Signed-off-by: Ellmor <susu@o2.pl>
Merge branch 'master' of https://github.com/AlexanderPeev/TweenstyleApps
Dao and intents

Signed-off-by: Ellmor <susu@o2.pl>
Merge branch 'master' of https://github.com/AlexanderPeev/TweenstyleApps

Conflicts:
	Project/src/dk/tweenstyle/android/app/BasketActivity.java
	Project/src/dk/tweenstyle/android/app/MiniBarFragment.java

Signed-off-by: Ellmor <susu@o2.pl>