Merge pull request #1 from earthengine/master

Add jquery and have add/remove cards function implemented and initial interface
Merge pull request #2 from earthengine/master

Fixed "cancel" button on edit card dialog
2014.09.12
Add data into database
Commit local changes
Remove of .DS_Store file
Merge remote-tracking branch 'upstream/ccp01'

Conflicts:
	css/jquery-ui.css
	css/jquery-ui.min.css
	css/jquery-ui.structure.css
	css/jquery-ui.structure.min.css
	css/jquery-ui.theme.css
	css/jquery-ui.theme.min.css
	css/main.css
	image/.DS_Store
	image/ui/ui-bg_diagonals-thick_18_b81900_40x40.png
	image/ui/ui-bg_diagonals-thick_20_666666_40x40.png
	image/ui/ui-bg_flat_10_000000_40x100.png
	image/ui/ui-bg_glass_100_f6f6f6_1x400.png
	image/ui/ui-bg_glass_100_fdf5ce_1x400.png
	image/ui/ui-bg_glass_65_ffffff_1x400.png
	image/ui/ui-bg_gloss-wave_35_f6a828_500x100.png
	image/ui/ui-bg_highlight-soft_100_eeeeee_1x100.png
	image/ui/ui-bg_highlight-soft_75_ffe45c_1x100.png
	image/ui/ui-icons_222222_256x240.png
	image/ui/ui-icons_228ef1_256x240.png
	image/ui/ui-icons_ef8c08_256x240.png
	image/ui/ui-icons_ffd27a_256x240.png
	image/ui/ui-icons_ffffff_256x240.png
	index.php
	interface/new_card.php
	js/jQueryPlugins.js
	js/jquery-1.9.1.min.js
	js/jquery.json-2.4.js
	js/jquery.jsonrpcclient.js
	js/jquery.mobile-1.3.2.min.js
	js/jquery.mobile.router.min.js
	js/jquery.storageapi.js
	js/jquery.textcomplete.js
	js/main.js
	page_top.php
Merge master and ccp01