Merge branch 'hotfix-improvements' into develop

* hotfix-improvements:
  implemented a lot of catch code in the database, as Cursor's throw an IllegalStateException if the activity have been paused. Don't currently know what else to do.
  Changed the Observable to not throw exceptions when trying to re-register an Observer
  Fixed bug causing IllegalStateException on registering an observer, because it wasn't previously removed. Also the observer wasn't registered on first load. Included files this time
  Fixed bug causing IllegalStateException on registering an observer, because it wasn't previously removed. Also the observer wasn't registered on first load
Fixed a bug, caused by a very unlikely import statement, importing a object with same name and methods.
Merge branch 'hotfix-observer' into feature-librum

* hotfix-observer:
  Fixed a bug, caused by a very unlikely import statement, importing a object with same name and methods.

Conflicts:
	etasdk/src/com/eTilbudsavis/etasdk/DataObserver/DataObservable.java