Aaron

Aaron
old copy?

maybe old cop?
Merge branch 'master' of https://github.com/tabletenniser/gitHub

Conflicts:
	AARONslider.html
	scripts/search.js
	views/composites/horizontalView.js
	views/event.js
	views/itemviews/activityItemView.js
change