Swapped search icon position
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject
Fixed adding annotation issues; now displays and saves text and images
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject