Merge branch 'ryandev' of github.com:curtisullerich/butterflies into ryandev
Merge branch 'ryandev' of github.com:curtisullerich/butterflies into ryandev
#94 progress, having a wierd problem with the database, need to talk to Cameron.
Finished #94: Editing Butterflies in the butterfly list.
Merge branch 'ryandev' of github.com:curtisullerich/butterflies into ryandev
Merge branch 'ryandev' into dev
attempted fix for tablet layout mess
updated manifest and attempted fix for tablet layout