May. 4th. Changes in the layout, not yet fully redefined
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Wikitude Refactoring
  Partially fixed Wikitude scanning implementation
May. 4th. Changes in the layout, not yet fully redefined
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Completed initial MoodStocks Scanner and Initial Wikitude implementation.
  Added base code for Moodstocks scanner

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java
	app/src/main/res/values/strings.xml
The code contains problem with the recommendation fragment view ... flipgage would not show.
Also, added local mockup POI file : SamplePois.html. fix the postfix ?
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Completed initial MoodStocks Scanner and Initial Wikitude implementation.
  Added base code for Moodstocks scanner

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java
	app/src/main/res/values/strings.xml
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Hooked up activities to run together.
  Started Spring Boot Actuator.

Conflicts:
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/ProductActivity.java
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/model/MockModel.java
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/model/Product.java
	app/src/main/res/layout/fragment_search.xml
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Completed initial MoodStocks Scanner and Initial Wikitude implementation.
  Added base code for Moodstocks scanner

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/se/kth/csc/ubicomp/ubishopper/scan/SearchFragment.java
	app/src/main/res/values/strings.xml
Merge branch 'initialize-views' of https://github.com/mhotan/UbiShopper into initialize-views-wikitude

# By Michael Hotan
# Via Michael Hotan
* 'initialize-views' of https://github.com/mhotan/UbiShopper:
  Update Wikitude Augmented Reality Portion

Conflicts:
	.idea/libraries/support_v13_19_1_0.xml
	.idea/libraries/support_v4_19_1_0.xml
	app/src/main/assets/wikitude/js/nativePoiDetail.js
Added small Products and Inmormation for wikitude POI view.
Added small Products and Inmormation for wikitude POI view.
changes to the style...
Changes for the DEMO
Changes for the DEMO