Android L Support Added
Merge remote-tracking branch 'origin/master'

Conflicts:
	OrderAtSamos/bin/OrderAtSamos.apk
	OrderAtSamos/bin/classes.dex
	OrderAtSamos/bin/classes/com/tardis/ordersamos/MenuView.class
	OrderAtSamos/bin/classes/com/tardis/ordersamos/Random$2.class
	OrderAtSamos/bin/classes/com/tardis/ordersamos/Search$1.class
	OrderAtSamos/bin/resources.ap_
sdfggnhdcfgvhjmfgnmh
Revert to basic
test 1
den xerw ama pezei
Fixed Project
Database Update
Merge remote-tracking branch 'origin/local_Jim'
Final Bugs Fixed
Merge remote-tracking branch 'origin/local_Jim'
Database done Random Info Button added

Random Updates
Merge remote-tracking branch 'origin/local_Jim'
trials