Resolve conflicts
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its

Conflicts:
	src/com/cse110team14/placeit/MainActivity.java
	src/com/cse110team14/placeit/model/PlaceIt.java
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its
fixed
classpath changed
download data fixed
change icon & notification text
change hirearchy
changed
Merge branch 'master' of https://bitbucket.org/m1samuel/place-its

Conflicts:
	lint.xml