add player controls
no message
Merge branch 'finishing' of https://github.com/thunderdomes/Struts into finishing

Conflicts:
	.DS_Store
update controller next pref
Merge branch 'finishing' of https://github.com/thunderdomes/Struts into finishing

Conflicts:
	.DS_Store
update player control
player control.. shuffle.
update mini player
update
no message
commit1
Merge branch 'finishing' of https://github.com/thunderdomes/Struts into finishing
1
Facebook login
update login Facebook
update login Facebook
update
no message
re-add facebook sdk ios
update Facebook framework