Added shape drawing functions
added setcardview
merged conflict