nas upload api done using shell script
Merge branch 'dev-nas' of https://github.com/kevinptt0323/NewCuteDogCushion into dev-nas

Conflicts:
	web/api/nas/login.php
remove stupid files
add three files
add logout.sh to fix too many login problem
directory maker
Merge branch 'dev-nas' of https://github.com/kevinptt0323/NewCuteDogCushion into dev-nas
delete stupid files again
Merge branch 'dev-nas'
Merge branch 'dev-ui'

Conflicts:
	web/api/facebook/.parser.php.un~
	web/api/facebook/parser.php