test commit
ajax version
add  bootstrap
Merge branch 'master' of https://github.com/wax100/mobidev

Conflicts:
	index.php