Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Merge branch 'comparison' into develop
Comparison settings added in action bar.
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into comparison-filter

Conflicts:
	android/UbiSolar/UbiSolar/src/main/java/com/sintef_energy/ubisolar/fragments/CompareSimilarFragment.java
Code cleanup
Renaming of variables and methods
Minor change in tools referencesin menu xml
Merge pull request #84 from haavardlian/comparison-filter

Comparison filter