Update MainActivity.java
Update MainActivity.java
Added main.xml
Update MainActivity
Merge branch 'UI12' of https://github.com/groupENIGMA/journalEgocentrique into UI12
Delete obsolete package
Start working on UI1
Update for UI1/2

Now it works properly! I need to wait the implementation of DB
Cleaning the code.
First DB class implementation (added openHelper to manage dataBase and
implemented the first few functions of the DBInterface)
Improved ListActivity and created WriteNote.

Created also empty activities: MoodActivity and PhotoActivity.
They are all already linked to ListActivity.
github sucks
Merge   branch 'UI12' of https://github.com/groupENIGMA/journalEgocentrique into UI12

Conflicts:
	res/layout/main.xml
	src/com/github/groupENIGMA/journalEgocentrique/ListActivity.java
Removed a .DS_Store file that somehow crept in the repo

I've also updated the .gitignore to leave out these useless files.
Fixed the indentation on the entire DB.java file

I've finally discovered an useful eclipse feature: Source->Correct Indentation
Added a SimpleDateFormat to manage dates in DB.java

The use of this object should be more elegant compared to
the old method of concatenating/parsing strings "by hand".
Rewrited a couple of SQL queries to avoid SQL-injections
Fixed a couple of errors in the CREATE TABLE stataments in DB.java
Implemented the MoodActivity.
Rewrited all the docstrings in DB.java to inherit from its interface DBInterface