06 June Code pushed
Merge branch 'master' of https://github.com/gerryu/Delen01

Conflicts:
	app.js
	app/controller/MyInterests.js
	app/view/Detailmyinterests.js
	app/view/Listmyinterests.js
	touch/src/carousel/Infinite.js