Add english language
Merge conflict
Merge branch 'master' of https://github.com/yannchaput/WeddingPlanner.git

Conflicts:
	src/com/innovention/weddingplanner/GuestListFragment.java
	src/com/innovention/weddingplanner/TaskListFragment.java
Fix conflitcts issues