re-fork

re-fork
Merge branch 'master' of https://github.com/saidalbahra/STRL-Cyto

Conflicts:
	www/index.html
	www/js/main.js
	www/res/android/screens/mdpi.9.png
	www/res/android/screens/xhdpi.9.png
	www/res/ios/screens/startup-iphone5-retina.png
	www/res/ios/screens/startup-retina.png
	www/res/ios/screens/startup-tablet-landscape-retina.png
	www/res/ios/screens/startup-tablet-landscape.png
	www/res/ios/screens/startup-tablet-portrait-retina.png
	www/res/ios/screens/startup-tablet-portrait.png
	www/res/ios/screens/startup.png
	www/res/winphone/screens/startup.jpg