initial build commit

with some background foo
Merge ssh://cloudcontrolled.com/repository

Conflicts:
	app.js
	app.json
	cache.appcache

deltas/resources/css/app.css/faf42bb4addf21258bc1334dcf5660fddf0f393f.js
on
	index.html
	resources/css/app.css