testing again...
Merge remote-tracking branch 'Aaron/master'
Merge remote-tracking branch 'Aaron/master'
Merge remote-tracking branch 'Aaron/master'
create controllers and persistence project

move server-side code out of android project

initial implementation of login servlet in web service
ignore Thumbs.db